Merge tag 'upstream/2016.7' into debian/master
authorSimon McVittie <smcv@debian.org>
Sat, 16 Jul 2016 20:06:36 +0000 (21:06 +0100)
committerSimon McVittie <smcv@debian.org>
Sat, 16 Jul 2016 20:06:36 +0000 (21:06 +0100)
Upstream version 2016.7


Trivial merge